tools-libxc-abiname.diff

Patch-Name: tools-libxc-abiname.diff

Gbp-Pq: Topic prefix-abiname
Gbp-Pq: Name tools-libxc-abiname.diff

diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile
index d26bf8dfac9c3c1f2aca53f8d344bedf535dc911..675222d9d99770f174f484a0cd58950efca1188c 100644 (file)
--- a/tools/libxc/Makefile
+++ b/tools/libxc/Makefile
@@ -1,9 +1,6 @@
 XEN_ROOT = $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
-MAJOR    = 4.11
-MINOR    = 0
-
 ifeq ($(CONFIG_LIBXC_MINIOS),y)
 # Save/restore of a domain is currently incompatible with a stubdom environment
 override CONFIG_MIGRATE := n
@@ -134,12 +131,12 @@ $(CTRL_LIB_OBJS) $(CTRL_PIC_OBJS): CFLAGS += $(CFLAGS_libxengnttab)
 
 LIB := libxenctrl.a
 ifneq ($(nosharedlibs),y)
-LIB += libxenctrl.so libxenctrl.so.$(MAJOR) libxenctrl.so.$(MAJOR).$(MINOR)
+LIB += libxenctrl.so libxenctrl-$(PACKAGE_VERSION).so
 endif
 
 LIB += libxenguest.a
 ifneq ($(nosharedlibs),y)
-LIB += libxenguest.so libxenguest.so.$(MAJOR) libxenguest.so.$(MAJOR).$(MINOR)
+LIB += libxenguest.so libxenguest-$(PACKAGE_VERSION).so
 endif
 
 genpath-target = $(call buildmakevars2header,_paths.h)
@@ -160,7 +157,7 @@ $(CTRL_LIB_OBJS) $(GUEST_LIB_OBJS) \
 $(CTRL_PIC_OBJS) $(GUEST_PIC_OBJS): xc_private.h
 
 PKG_CONFIG := xencontrol.pc xenguest.pc
-PKG_CONFIG_VERSION := $(MAJOR).$(MINOR)
+PKG_CONFIG_VERSION := $(PACKAGE_VERSION)
 
 ifneq ($(CONFIG_LIBXC_MINIOS),y)
 PKG_CONFIG_INST := $(PKG_CONFIG)
@@ -190,15 +187,13 @@ libs: $(LIB) $(PKG_CONFIG_INST) $(PKG_CONFIG_LOCAL)
 install: build
        $(INSTALL_DIR) $(DESTDIR)$(libdir)
        $(INSTALL_DIR) $(DESTDIR)$(includedir)
-       $(INSTALL_SHLIB) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)
+       $(INSTALL_SHLIB) libxenctrl-$(PACKAGE_VERSION).so $(DESTDIR)$(libdir)
+       $(SYMLINK_SHLIB) libxenctrl-$(PACKAGE_VERSION).so $(DESTDIR)$(libdir)/libxenctrl.so
        $(INSTALL_DATA) libxenctrl.a $(DESTDIR)$(libdir)
-       $(SYMLINK_SHLIB) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)/libxenctrl.so.$(MAJOR)
-       $(SYMLINK_SHLIB) libxenctrl.so.$(MAJOR) $(DESTDIR)$(libdir)/libxenctrl.so
        $(INSTALL_DATA) include/xenctrl.h include/xenctrl_compat.h $(DESTDIR)$(includedir)
-       $(INSTALL_SHLIB) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)
+       $(INSTALL_SHLIB) libxenguest-$(PACKAGE_VERSION).so $(DESTDIR)$(libdir)
+       $(SYMLINK_SHLIB) libxenguest-$(PACKAGE_VERSION).so $(DESTDIR)$(libdir)/libxenguest.so
        $(INSTALL_DATA) libxenguest.a $(DESTDIR)$(libdir)
-       $(SYMLINK_SHLIB) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)/libxenguest.so.$(MAJOR)
-       $(SYMLINK_SHLIB) libxenguest.so.$(MAJOR) $(DESTDIR)$(libdir)/libxenguest.so
        $(INSTALL_DATA) include/xenguest.h $(DESTDIR)$(includedir)
        $(INSTALL_DATA) xencontrol.pc $(DESTDIR)$(PKG_INSTALLDIR)
        $(INSTALL_DATA) xenguest.pc $(DESTDIR)$(PKG_INSTALLDIR)
@@ -208,15 +203,13 @@ uninstall:
        rm -f $(DESTDIR)$(PKG_INSTALLDIR)/xenguest.pc
        rm -f $(DESTDIR)$(includedir)/xenguest.h
        rm -f $(DESTDIR)$(libdir)/libxenguest.so
-       rm -f $(DESTDIR)$(libdir)/libxenguest.so.$(MAJOR)
-       rm -f $(DESTDIR)$(libdir)/libxenguest.so.$(MAJOR).$(MINOR)
+       rm -f $(DESTDIR)$(libdir)/libxenguest-$(PACKAGE_VERSION).so
        rm -f $(DESTDIR)$(libdir)/libxenguest.a
        rm -f $(DESTDIR)$(PKG_INSTALLDIR)/xencontrol.pc
        rm -f $(DESTDIR)$(includedir)/xenctrl.h
        rm -f $(DESTDIR)$(includedir)/xenctrl_compat.h
        rm -f $(DESTDIR)$(libdir)/libxenctrl.so
-       rm -f $(DESTDIR)$(libdir)/libxenctrl.so.$(MAJOR)
-       rm -f $(DESTDIR)$(libdir)/libxenctrl.so.$(MAJOR).$(MINOR)
+       rm -f $(DESTDIR)$(libdir)/libxenctrl-$(PACKAGE_VERSION).so
        rm -f $(DESTDIR)$(libdir)/libxenctrl.a
 
 .PHONY: TAGS
@@ -249,22 +242,18 @@ rpm: build
 libxenctrl.a: $(CTRL_LIB_OBJS)
        $(AR) rc $@ $^
 
-libxenctrl.so: libxenctrl.so.$(MAJOR)
-       $(SYMLINK_SHLIB) $< $@
-libxenctrl.so.$(MAJOR): libxenctrl.so.$(MAJOR).$(MINOR)
+libxenctrl.so: libxenctrl-$(PACKAGE_VERSION).so
        $(SYMLINK_SHLIB) $< $@
 
-libxenctrl.so.$(MAJOR).$(MINOR): $(CTRL_PIC_OBJS)
-       $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenctrl.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(LDLIBS_libxentoollog) $(LDLIBS_libxenevtchn) $(LDLIBS_libxengnttab) $(LDLIBS_libxencall) $(LDLIBS_libxenforeignmemory) $(LDLIBS_libxendevicemodel) $(PTHREAD_LIBS) $(APPEND_LDFLAGS)
+libxenctrl-$(PACKAGE_VERSION).so: $(CTRL_PIC_OBJS)
+       $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -Wl,$(SONAME_LDFLAG),$@ $(SHLIB_LDFLAGS) -o $@ $^ $(LDLIBS_libxentoollog) $(LDLIBS_libxenevtchn) $(LDLIBS_libxengnttab) $(LDLIBS_libxencall) $(LDLIBS_libxenforeignmemory) $(LDLIBS_libxendevicemodel) $(PTHREAD_LIBS) $(APPEND_LDFLAGS)
 
 # libxenguest
 
 libxenguest.a: $(GUEST_LIB_OBJS)
        $(AR) rc $@ $^
 
-libxenguest.so: libxenguest.so.$(MAJOR)
-       $(SYMLINK_SHLIB) $< $@
-libxenguest.so.$(MAJOR): libxenguest.so.$(MAJOR).$(MINOR)
+libxenguest.so: libxenguest-$(PACKAGE_VERSION).so
        $(SYMLINK_SHLIB) $< $@
 
 ifeq ($(CONFIG_MiniOS),y)
@@ -276,9 +265,9 @@ endif
 xc_dom_bzimageloader.o: CFLAGS += $(filter -D%,$(zlib-options))
 xc_dom_bzimageloader.opic: CFLAGS += $(filter -D%,$(zlib-options))
 
-libxenguest.so.$(MAJOR).$(MINOR): COMPRESSION_LIBS = $(filter -l%,$(zlib-options))
-libxenguest.so.$(MAJOR).$(MINOR): $(GUEST_PIC_OBJS) libxenctrl.so
-       $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(GUEST_PIC_OBJS) $(COMPRESSION_LIBS) -lz $(LDLIBS_libxenevtchn) $(LDLIBS_libxenctrl) $(PTHREAD_LIBS) $(APPEND_LDFLAGS)
+libxenguest-$(PACKAGE_VERSION).so: COMPRESSION_LIBS = $(filter -l%,$(zlib-options))
+libxenguest-$(PACKAGE_VERSION).so: $(GUEST_PIC_OBJS) libxenctrl-$(PACKAGE_VERSION).so
+       $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG),$@ $(SHLIB_LDFLAGS) -o $@ $(GUEST_PIC_OBJS) $(COMPRESSION_LIBS) -lz $(LDLIBS_libxenevtchn) $(LDLIBS_libxenctrl) $(PTHREAD_LIBS) $(APPEND_LDFLAGS)
 
 -include $(DEPS_INCLUDE)